merge trunk
authorK. Handa <handa@gnu.org>
Sat, 11 Jan 2014 14:22:26 +0000 (23:22 +0900)
committerK. Handa <handa@gnu.org>
Sat, 11 Jan 2014 14:22:26 +0000 (23:22 +0900)
commit0c83250ad7957f747169fa529b760b53488ae1e8
tree6a10bfc7b70a4830d23ddf99f0eddd8b8001dea1
parent6ce7a2e17b54efd82a88f9913dc442eab6bf7182
parentd2a00beab2cad9653e2755cbe3cc53f72f832764
merge trunk